Merge 'bitcoin/0.12', fix/dashify #966
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Github-Pull: bitcoin#7720 Rebased-From: fab3890
Github-Pull: bitcoin#7684 Rebased-From: fa3a81a fad7dc8 fad8cfb
Github-Pull: bitcoin#7372 Rebased-From: facd288
Github-Pull: bitcoin#7320 Rebased-From: fa1cb1a
Github-Pull: bitcoin#7702 Rebased-From: fa4a522
Github-Pull: bitcoin#7757 Rebased-From: fa3fafc
Github-Pull: bitcoin#7778 Rebased-From: fa524d9 fa2cea1 faaa3c9 4444806
Github-Pull: bitcoin#7697 Rebased-From: ec14339
Github-Pull: bitcoin#7853 Rebased-From: faa41ee, fa7abe0 Conflicts: qa/rpc-tests/invalidtxrequest.py qa/rpc-tests/p2p-feefilter.py qa/rpc-tests/proxy_test.py qa/rpc-tests/test_framework/mininode.py qa/rpc-tests/test_framework/netutil.py src/test/bctest.py
Github-Pull: bitcoin#7801 Rebased-From: ffff866
Github-Pull: bitcoin#7822 Rebased-From: fa942c7 5d217de
6862627 Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca) 28ba22c [qa] Remove misleading "errorString syntax" (MarcoFalke) f1f1b82 [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke) c0d9e31 Tests: make prioritise_transaction.py more robust (Suhas Daftuar) ff9b436 [qa] Bug fixes and refactor (MarcoFalke) b1dd64b [qa] wallet: Wait for reindex to catch up (MarcoFalke) f23cb7c [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke) 3316552 [qa] Test walletpassphrase timeout (MarcoFalke) 6aae129 [qa] wallet: Print maintenance (MarcoFalke) ad8c743 [qa] Extend tests (MarcoFalke) d89fbfe [qa] rpc-test: Normalize assert() (MarcoFalke)
Github-Pull: bitcoin#7489 Rebased-From: 7539f1a
Github-Pull: bitcoin#7164 Rebased-From: 39a525c
Github-Pull: bitcoin#7527 Rebased-From: c372572
Github-Pull: bitcoin#7526 Rebased-From: 37767fd
Github-Pull: bitcoin#7189 Rebased-From: 3d19193
It looks like, TorController::disconnected_cb(TorControlConnection& conn) gets called multiple times which results in multiple event_new(). Avoid this by creating the event only once in the constructore, and deleting it only once in the destructor (thanks to Cory Fields for the idea). Replaces the fix by Jonas Schnelli in bitcoin#7610, see discussion there. Github-Pull: bitcoin#7637 Rebased-From: e219503
Github-Pull: bitcoin#7521 Rebased-From: 5a2b1c0
see issues: bitcoin-dot-org/Bitcoin.org#1237 bitcoin#7532 Github-Pull: bitcoin#7541 Rebased-From: 7eef1d0
We do not know that a class of Network is reachable, only that it is not. Github-Pull: bitcoin#7553 Rebased-From: 110b62f
…onnections. Github-Pull: bitcoin#7642 Rebased-From: d84ea1a
curl is required to fetch dependencies Github-Pull: bitcoin#7658 Rebased-From: ce41cf0
Previously we used the CInv that would be sent to the peer announcing the transaction as the key, but using the txid instead allows us to decouple the p2p layer from the application logic (which relies on this map to avoid duplicate tx requests). Github-Pull: bitcoin#7862 Rebased-From: 7e91f63
…/util.cpp`. See bitcoin#7845 (comment). Also refactored `GetDefaultDataDir` function to return path for Mac in one expression. Github-Pull: bitcoin#7850 Rebased-From: 41dbc48
Previously we would assert that if every block in vBlockHashesToAnnounce is in chainActive, then the blocks to be announced must connect. However, there are edge cases where this assumption could be violated (eg using invalidateblock / reconsiderblock), so just check for this case and revert to inv-announcement instead. Github-Pull: bitcoin#7919 Rebased-From: 3a99fb2
Github-Pull: bitcoin#7517 Rebased-From: b0ff857 2317ad7 0ecb340
Github-Pull: bitcoin#7951 Rebased-From: 5555528 fada064
Github-Pull: bitcoin#7980 Rebased-From: fa17f93 43bbcd0
(cherry picked from commit fa8cd46)
dc38a53 [qa] Move create_tx() to util.py (MarcoFalke) c0fe8b5 [qa] smartfees: Properly use ordered dict (MarcoFalke) 493b89e [qa] test_framework: Properly print exceptions and assert empty dict (MarcoFalke) 7a83489 Tests: Fix deserialization of reject messages (Suhas Daftuar) e0b1bbe [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke) 697ed8c Check if zmq is installed in tests, update docs (Elliot Olds) d5a9de3 tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan) ed2f0e3 [qa] maxblocksinflight: Actually enable test (MarcoFalke) 3036282 [qa] httpbasics: Actually test second connection (MarcoFalke) afbc000 test_framework: python3.4 authproxy compat (Wladimir J. van der Laan) 80b6bfa test_framework: detect failure of bitcoind startup (Wladimir J. van der Laan) 4ffd309 Create SingleNodeConnCB class for RPC tests (Alex Morcos) 4fd6008 travis: 'make check' in parallel and verbose (Cory Fields) 2d2b045 Reenable multithread scheduler test (Pavel Janík) 658307e test: Add more thorough test for dbwrapper iterators (Wladimir J. van der Laan)
Printing Log without category defined should use LogPrintf
ba61949 Fix LogPrint to LogPrintf (TheLazieR Yip)
ffff324 [doc] 0.12: prepare release notes (MarcoFalke)
9462e79 This is a cherry-pick of 89c844d back to 0.12. (Johnathan Corgan) 932aedd Cherry-pick of f59dceb (bitcoin#7925) to 0.12. (Johnathan Corgan) 03c709b Backport leveldb build integration to 0.12 (Johnathan Corgan)
Github-Pull: bitcoin#8042 Rebased-From: 276ce84
…CEVERIFY bitcoin#7540" c4e5688 Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (BtcDrak) ac5577b Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (BtcDrak)
…hscreen/verification state fe98533 [Qt] Disable some menu items during splashscreen/verification state (Jonas Schnelli)
NOTE: .travis.yml was mostly preserved, probably needs additional attention
|
What's the relationship between this and this previous commit: #914 ? Are we trying to sync with 2 different upstreams ? |
Author
|
@tgflynn Bitpay's bitcoin is a fork of original bitcoin 0.12, it has additional feature on top of original and is optional. This merges original upstream which is more or less a must. |
|
So Bitpay's version doesn't itself track core ? |
Author
|
@tgflynn like for any other fork it's completely up to them if they want to track it or not, we can't force them to do this the way we want :) Bitpay's version was more like "a one time merge of cool additional features" and I would keep it this way |
|
I take it there will still be another set of changes to merge from 0.12.1 ? |
|
What about this commit ? "This brings Dash 0.12.1.x codebase in line with Bitcoin release 0.12.1" - 56 changed files. |
|
Then these changes must be targeting bitcoin 0.13 because 0.12.1 was the last 0.12 release, AFAIK. |
|
The last commit there was from July 11. I imagine they decided not to release 0.12.2 sometime between then and the 0.13 release. I certainly don't think they're going to do it now that 0.13 has been released. So I think these are changes that will either never go into a bitcoin release or will/have gone into 0.13 for the ones that were back-ported. |
| ret += strprintf("0x%x 0x%x ", HexStr(it2, it - vch.size()), HexStr(it - vch.size(), it)); | ||
| } else { | ||
| ret += strprintf("0x%x", HexStr(it2, it)); | ||
| ret += strprintf("0x%x ", HexStr(it2, it)); |
There was a problem hiding this comment.
This looks strange. HexStr returns a string but %x format normally expects an int type.
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge bitcoin upstream 0.12, dashify were needed, fix conflicts.
NOTE:
mapAlreadyAskedFornow uses inv.hash as a key instead of inv itself, could be a good idea to make sure that all hashes for our invs are actually unique.